Refactor + don't fix Subject in header