started refactoring of Figures