Flag on the play. Unnecessary nesting.
Merge branch 'if-statement-code-smell'