Corrected some typos for cleanup routines