enhancements/cleanup for PR 372