Refactoring :facepunch: