java conventions; additional javadoc