Fixed 1 and checkstyle