continue refactor code