Some minor structuring