Improved code clarity and drop uninteresting pakets earlier.