reformat, one var
adopted whif changes
merged develop