Tidy code (#2562)

5 jobs for v2.0 in 13 minutes and 41 seconds (queued for 5 seconds)