Code cleanup.

Addressing #40.