Fix checkstyle and make code compatible with java 5