Incorporated code review comments and handled CI failures
Merge pull request #100 from anuchandy/dev1

Incorporated code review comments and handled CI failures