Another commit of small mostly cosmetic changes to Baselli