Address Jordan's review comments