More fixes around spacing and capitalisation.