little code refinement