Fix #59.
Cleanup.