Just some code refinement