modularize & clean up prompt bits