Small little refactorings

As of C# 3.0, get and set can be minimized if they aren't doing anything
else than setting and getting the values. Some indenting too.
Fixed some things that I broke.
Switch instead of if/else