More type-hinting, formatting