remove a little duplication