fix styling bugs from scrutinizer

see https://scrutinizer-ci.com/g/cargomedia/CM/issues/?selectedLabels%5B0%5D=3&orderField=path&order=asc