Changes for onPreResponse
Tidy
Changes for methods