refactor
fight!