Small vars refactoring & reponse header filtering