improve method order; no functional change
small code and javadoc cleanups