Resolve checkstyle warnings