DDF-675: Cleaned up javadocs