Cleanup.
Fix #85