clean up and comments
cleanup