#4137 general tidy