Remove a little duplication