Add type-hints and remove unused use statements