Vikram | code review comments incorporated