remove merge leftovers
fix alignment issues
more explicit variable names
tighten unit-tests for asterisk_conf
replace loop with list comprehensions