Refactoring with golint