Checkstyle errors are fixed