Might be a good time to fix the indenting and other code style on this file too? (ie. convert it all to tabs not spaces)