proper structuring changes