A little code simplification