#9 Refactoring 2

#9 Refactoring 2