request minor refactoring