Various changes based on new linting suggestions