Cleanup, adding option for make_up