Total overhaul of structure and style