refactoring by FindBugs
refactoring by CheckStyle
refactoring and add comments