Fixing checkstyle issues.
Further improvements, still no 100% :/.