Code Changes as per review comments by Antoine Pitrou.
2 files changed