streamlining and javadoc