Cleanup. Issue #231