Cleanup
Merging
Updated to Google