JDK 7 coding conventions refactoring.