refactoring 230614