Refactoring HLint warnings.