further tidy-ups to meet standards for Travis