refs #38: code cleanup