altered reference to cleanup function
altered cleanup function