Tidy up API - bit more documentation