Refactoring / Bounding for all figures