Fixed some checkstyle issues
Removed unused local variable