Patches some suggestions from @pieterlexis
- Pruned unnecessary variable `remove_header` #L196
- Fixed indent #L358
- Removed break, replaced with raise exception #363-365