Updating some public fields to be private and use public getter methods instead