Fix Checkstyle Warnings (critical warnings)