cleaning refactoring