<a title="A lot of (minor) cleaning up" href="https://github.com/opencor/opencor/pull/2010">PR #2010</a>: A lot of (minor) cleaning up