Use defaults for settings
More sensible defaults
Commenting, better naming