fix lint errors, simplify API name