Cleaning up and Javadoc additions