- Renaming methods and javadoc to improved understanding