Code homogenization
Added missing var