Challenge - Generate and refactor Java 7 to 8