Refactor code to Java 7 standards.