cleanup related to refs #7 and #6 for #5