Changed class namespacing

Ok, so I also made a whitespace change.  And a couple of comments.