Cleaning up code, using push as a BackUp