Minor adjustment to cleanup