Refactor: discussed w/ David