refs #88: Code cleanup