more refactoring work
Merge branch 'sprint' of github.com:jacobwagner/rpcsqa into sprint