refactor helpers to better suit their purpose