Static coding analysis done and fixed some issues
Fixed issues found by CheckStyle