clean up and comments