Some javadocing