Refactoring

Code refactoring :smiley: