pmd fix
formatting and bug fix
Merge pull request #1 from sumanta23/work

Work