Refactor finished

Probably…