continue refactoring code