style and structure changes