aligning codebase to jdk 1.6