#9 Refactoring

#9 Refactoring