Restructure req.body + remove unneeded code