Small code review comments added

Small code review comments added by client/product owner (one of DevCrowd organizers). Please use PMD or FindBugs or other static code analyzing tool on whole project.