Unpack tuple immediately for easier reading
Minor comment changes
Add support for a line removal limit
Remove cruft
Just check every zone every time