Cleaning refactoring