Code review amends
Code review amends

- remove repetition by consolidated if statements where outcomes are the
same
- replace small if statements with ternary statements to reduce nesting.

alphagov/smart-answers,alphagov/smart-answers,alphagov/smart-answers,alphagov/smart-answers