Refactor

Boom