code review + javadoc
code review + javadoc