Refactoring Request clas