Cleaning, before refactoring