put conditionals on to multiple lines, always
clean things up a bit