Reduce path method complexity
Merge pull request #257 from moneyadviceservice/path-complexity

Reduce path method complexity