Refactor

:tractor: