rename, removed redundant type annotations