Added a little syntax improvement
Added request refactoring