Dealt with checkstyle warnings.