Fixing minor issues.
Addressing review comments.