Fixed some checkstyle issues
Long line checkstyle issue is fixed
Fixed some checkstyle issues
Final field to a final method