refs #46: code cleanup