Refactor towards JDK 1.7 enhancements