refactor

Signed-off-by: Tajinder Singh <tajinder.singh@clicktravel.com>