Code Review, Adds Jdoc, Refactoring

Refs #6