'housekeeping' - renaming, refactoring