clean up of the code