Follow up on push notifications code review