FC-69 Updated following review

Signed-off-by: Steffan Westcott <steffan.westcott@clicktravel.com>