Settings: code cleanup