Minor Commit

Cleanup/Javadoc