Checkstyle fixes
Fixed checkstyle ...
Code clean up and checkstyle fixes
switched back to WARN level ...
Fix last test issue ...