Clean code
Fix response / set req