clean up on code