Fix #287 and improve CS/readability of various parts of the code #288
+245
−567
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.