+javadoc
small style changes