Code sweep syntax changes