Refactor capture helpers

What do you think @tylrtrmbl?