'Port of carrier text from jellybean3 branch (2 of 2)
 few clean ups.