Made additional Style and Structure modifications