clean up and fix inconsistencies