Updated varible names for clarity