More responsive style cleanup from linting