minor cleanups and whitespace normalisation
4 files changed