Use a guard clause instead of wrapping the code inside a conditional expression
Merge pull request #691 from moneyadviceservice/refactor/guard-clause

Use a guard clause instead of wrapping the code inside a conditional exp...