Merge pull request #117 from Knewton/registrycleanup

CheckStyles/code cleanup and JavaDoc