clean up a few duplicate calls to same method