A small cleanup...