Remove mixed use of tabs and spaces

Tabs can been replaced with spaces as spaces were predominant.
Formatting was done with clang-format on functions containing tabs -
rather than the whole file - to try and reduce the diff.