cleaned up some of the code

removed and tidied a few comments