lil bit o cleanup