Improved if statement linting