Just cleaning up as I read, no behaviour changes