Good ideas both, Ben. 
I've incorporated the changes.