minor clean-up

remove 2 conditionnal branches
shorten a long line.