Lezaza's version

Little change for coding format