A little tidy from the last commit