Refactoring, add more type annotations