Convert spaces to tabs, cleanup

Spaces to tabs, remove trailing whitespace