Tweaked comments
Removed a superfluous method; improved unit tests