suppa refactoring of figure generation