#7 Refactoring

#7