refactor to Java 7 standards