Refactoring

harashoo~