Refactoring post linting