Fixed checkstyle warnings and errors