refactoring, tests, api research