refactorizing continues: pickups less of a problem, but still a problem