- push message refactoring