Request method refactoring
Last helping refactors