continue refactor