First piece of change :)

Linqed up the settings a bit.
Also some renames to keep in style.