Started on cleaing up Javadoc