prio: align switch lines
prio: separate remove and pop operations