Tried doing as I suggested...I think it ends up being clearer this way.