Refactoring changes

Boom!