Made code more HLint compliant... More because HLint is lying some...