Save shape formatting
Refactoring