- Change fields from public to private - Make classes package-private where appropriate - Remove redundant javadoc