cleaned up the global variables' names

There were some leftover global variables from previous version that are not used any more, those I deleted. And one was missing in one procedure, so I added it to correct the functionality.
Please, merge.
Thank you,
Iva Jancigova (object-in-fluid)