Add type signatures
Formatting