Clean up a bit. [#204][#219]