Back to good ol' refactorman duties