Downgraded from Google Play Services 13, tidied up code