removed inconsistencies with the refactoring