change undescore variables for readability