code refactoring
Switch to java 6 target compilation