refs #1: Code cleanup