I have made changes to the code to improve the quality of code according to the recommendations pmd, findbugs and checkstyle.