Using HLint (and bringing the code into line)