Updated commit following review.

Signed-off-by: Gary Belcher <gary.belcher@clicktravel.com>