Fixed HLint complaints