Refactor helpers & update docs