Minor cleanup on the settings side