completed first phase of Request refactoring