clean up of code.