Few minor changes as per PR review feedback