clean up of code