Moving methods, javadoc, renaming.