javadoc
cleanup
sorting methods
format
naming conventions