Tidy up the public API

Before we tag a first release of this and commit to its API, let's just review the API quickly ...