Slight refactor of energy grants calculator
Merge pull request #1003 from alphagov/energy-grants-refactor

Refactor of energy grants calculator