Incorporated suggestions from A Papanikolaou. Thanks!