Cleared some checkstyle warnings.