Minor cleanup (removed header processing, fixed listings.