Minor code cleanup from the Settings Controller and view