Some code cleanup

Mostly converting \t to spaces for better viewing on GitHub.