Structural and style modifications