A small clean up