Update with suggested fixes from feedback

- Handle Content-Type with more than one ';'
- No need to define a charset variable since it's not used