Cleaned up tabs vs. spaces so that it is easier to diff.