Cleaned up some of the style issues (mostly "fluff" comments) in