Address djf's review comments