Add type annotations
Fix indentation