Massive refactoring using HLint