corrections on the cleanup