Notes:

And the most important refactoring, removing a bunch of code. Doesn't this give you inner calm?