better names
Polishing API. Docs. Update tests.