Changes to match java-examples oo-style