Refactored variables from multiple classes.