Minor structuring improvements