mostly finished cleaning and reorganizing GCMIntentService class