A little code cleanup