more clean up of the code