Some improvements made a lot of things clearer about function/method contexts, therefore the code is now clearer.