A small cleanup