Yes, that'll save a few lines and will simplify things a bit.