App does not crash on with no cellular data. Some code clean up