Small fixes and cleanups
Remove all trailing spaces/tabs
Retab everything with tabs, some more cleanups