Refactoring...
Lowered case on settings
Simplified structure somewhat...