refactoring 240614