Refactoring. Cleaner code.