Make it cleaner