continue refactoring styles