More cleanup, more annotations...

This seems like an endless job...

But it has to be done...
A LOT more cleanup again

And this is not over yet, very, very far from it!
More cleanup
More cleanup