Refactoring, renaming and cleaning-up