Removed some violations
Fixed a checkstyle violation