minor changes in the refactor