cleaning up a lot of inconsistencies