Cleaning, refactoring