Cleaned up public variables that could have been private instead.