update comments and imports to reflect previous commit