refactoring by Tsurumi san