move else-branch up to short circuit
break up long line
remove explicit else-branch; reindent