refs #12: code cleanup