Lint changes and formatting