Refactors the pusher code