tidy-up for some review comments