>Finish refactor
>34 files changed
>+101
>-590