added type annotations and removed some unused imports Mar 11