continue refactor work