no need to import classes in same package
rearrange code
fix JavaDoc : add parameter description
final is obsolete when private
fix coding style: variable name
wrap long line