Optimize SettingsActivity code

Remove some redundant stuff to get cleaner code