Settings Data Refactored

Refactored the Settings Data Class to no longer take the SharedPreferences object.