I like the shortcircuit, but I'd keep the two lines broken up maybe?