refs #3: minor code cleanup