Revert "Cleanup all spaces -> tabs (Where appropriate)"

This reverts commit 9c8dffa8070a930d00586e15845d847bca7cb3ee.
Revert "Fix bug #3"

This reverts commit 2690e44234b190db7cdfc6e7ead22fed58debdf5.