Some minor changes as per code review feedback