Refactored several private variables to private