Additional cleanup introduced
Cleaning up some of the logs and working a few tests
Cleared out some comments as well
Merge pull request #171 from collinwu/fix/additionalrefactor

Fix/additionalrefactor