smaller clean up