Tidy-up following review