Java 7 refactored