style improvements (from Mirebalais smoke tests)