Code cleanup - spaces to tabs, fix to bracing.