Made it cleaner