Java-lang v6.3 - code tidy