javadoc, style, redundant code