Cleaned up some javadocs