Changes done as per review comments