Cleaning up a little.

Changed some settings in notepad++ so cut it out with the tabs, change the
default tab to 2 spaces, etc.

Also renamed some things; minor changes.