* Cleanup excessive comments. * Remove leftovers hanging around from previous refactor * Improve test coverage