Making everything tidy after so many pull requests