Make it cleaner.