Lint and formatting fixes