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

Wed, 30 Mar 2016 11:23:20 UTC11