typo fix; api refactoring;
typo fix; test refactoring;
refactor api