API (no impl.) + basic test + small refactoring