Refactors request typing, pt.1