Use `ensure_has_branch`, added one test
Fixed indentation, quotes
Split string improvements - remove_string completely removes the line so that you don't end up with something like: ("abc,def,g" -> "abc,,g")
Refactor [none] output
[--add|--remove] -> (--add | --remove)
Update usage output