removed inconsistencies, general cleaning