House cleaning.

Closes #19, and closes #18.