fixed HLint warnings