Cleanup for a temp review, addition of some comment on the tests.