Moved token handling to a separate shared preferences location