Refactoring after writing up post, and results chart