Locking down, cleaning up...

I'm more strict about type annotations and final than most.

Take it or leave it :smile: