Update Google+

Add Google+ and clean the code