Fixed checkstyle errors/warnings