Whitespace fixes, tabs to spaces