minor code enhancements in the plumbing