Some unecessarily public variables are now private
Refactoring