House cleaning.

Closes #33.