some clean up and comments