review followup, fix docs, remove helper func