further cleanups
preparing notification messages
moved GCM logic to helper class