Tp/quality improvements part 3

Another set of clean-up.