Code update as per review comments