merged and changed type annotation style
merged and changed type annotations and typos