Automatic clean up of code