Fixing the code to be conform to JDK 1.7 conventions