woops; fix refactor