Changes made after review from Ryan Booker -- thanks