Refactor; more CHOKKAN-TEKI