refs #5 | cleanup