Removing checkstyle warnings
Fixing checkstyle warnings