Refactor: simplify request building