Cleaning up my git mistakes