minor refactor to remove duplication. -James
minor refactor to remove duplication. -James

tmeisenh/Stubble,marksands/Stubble,marksands/Stubble,marksands/Stubble,tmeisenh/Stubble,Stubble/Stubble,tmeisenh/Stubble