[style] Lots of work all around.