make it cleaner