Cleaning; refactoring.