small enhancements before complete refactoring of the carriers selection logic
renamings
some improvements in carrier selection logic