fix refactor leftovers