Alter method call order, update javadoc