Final tidy up of these files for unrequired whitespace and tabs