Refactored sharedPreferences (Still not working)