Continue type annotating
More type annotations
Whitespace changes and types