Adjusted the visibility of a few variables.