Structuring changes, comments on implementation