Code Cleanup

[!] CHANGED global private variables to normal ones (redundancy).