minor cleanup

* fixed tabbing, removed old commented out junk, added
  some comments