Linqed the settings up a bit.

Also some renames to keep in style.