removed extraneous comments.  Also started working on unit tests.