2293747 refactor