A little code optimization