Another small refactor which I forgot to include in the last commit