added/modified comments to reflect style guide, still a couple questions though (left in as TODO's to be finished before turning in