Minor amendments on variables names