Applied review comments from Andrew.