Ongoing cleanup
Type linting
Linting
Linting again