Remove a little bit of duplication