Refactor ahead of changes for #3