Update vigani_v2.2

code cleanup