That sounds pretty good to me, I'll update the code to reflect this discussion.