Apply Greg's review comments