oops fix refactoring