clean up and proper comments