Fix code smells

[simonpoole]

@tordanik there are a number of trivial code smells as a result of the PRs I just merged, didn't make sense to fix them inflight and mess up any work you are currently doing so I left them in. See https://sonarcloud.io/project/issues?id=mapsplit&resolved=false&sinceLeakPeriod=true&types=CODE_SMELL (I wouldn't fret about the code complexity ones, the limit is so low that it is often not reasonable to try and meet it).