Cleanup according to to HLint