A little code cleanup for #2