+1 on moving wifi and mobile data into another file. We could add a git issue for this.