fix style
fixing all broken statements that got broken in recent undefined runs