making it cleaner