Style & linter fixes