Solution tidy-up before split