Ignore Javadoc output and refactor some code
astyle-format sources
Merge pull request #19 from colatkinson/javadoc_fixes

Fix comments and code to be more stylistically correct