Clarify docs and cleanup syntax