Cleaning up code so that the pusher module handles everything