Refactor Negotiator & FormatNegotiator

Rename some variables
Create methods
Move methods