Small request refactor