Refactoring

extract method & class
Refactoring

add parameter