small code change in structure (better cosmetics)