Removing some of the global variables

We can discuss whether those should be class or instance variables and/or r/o properties.