#4137 Code tidy
#4137 code tody