final clean up and comments