made some cosmetic changes
cleaned up some comments