Much linting
Fix overzealous linting