Optimize the code for cleaners