Reverted some changes made to private variables.