Refactoring

shape