Refactor rules
Merge pull request #39 from alphagov/refactor_rules

Refactor rules