code tidy-up.