Vikram | code review comments incoroporated