Cleanup of the code base

I've done some cleanup to (hopefully) erradicate some of the style inconsistencies. The first commit cleans up the tab/space indentation issues. All indentitation has been converted to 4 spaces. I think that was the style used in majority of the code base.

Changes in the other commit are detailed in the log message.