A little code improvement