817 insertions(+), 948 deletions(-) Refactoring as it should be.