Make the code java 1.6 compliant