code refinement

-class field and method changed to be more meaningful