minor updates structuring