Minor refactoring
Settings page