-W/HLint cleanup