Refactoring -- More usage of FigureSetting