some more refinement

to be more readable