[wip] Style issues post 1.0