Code refactoring

shape