Resolved many checkstyle issues.