renamed vars to be more simple