52629993 refactoring