Cleaned up Javadocs