Cleaned-up some javadocs