Convert tabs to spaces
Remove old commented out code