clean up and proper figures