it's purely cosmetic, but you could merge these two p:choose and save a few lines. Just lemme know if you want to do this before I merge.