Update SettingsManager - Code Cleanup.

OCD Has kicked in here.