Tiny cleanup and API docs refactoring