FC-82 Updated code following review

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