cleaning up a little duplication