updated variable and class names for clarity