Incorporated HLint suggestions