Code tidy-up.