Making it cleaner