Removed HLint warnings