diff --git a/app/controllers/tutorial.controller.js b/app/controllers/tutorial.controller.js
index 15d0f99..7d2f75c 100644
--- a/app/controllers/tutorial.controller.js
+++ b/app/controllers/tutorial.controller.js
@@ -4,119 +4,95 @@ const Op = db.Sequelize.Op;
 
 // Create and Save a new Tutorial
 exports.create = (req, res) => {
+  const { title, description, published } = req.body;
   // Validate request
-  if (!req.body.title) {
-    res.status(400).send({
-      message: "Content can not be empty!"
-    });
-    return;
+  if (!title) {
+    return res.status(400).json({ message: "Content can not be empty!" });
   }
 
   // Create a Tutorial
   const tutorial = {
-    title: req.body.title,
-    description: req.body.description,
-    published: req.body.published ? req.body.published : false
+    title,
+    description,
+    published: req.body.published || false
   };
 
   // Save Tutorial in the database
   Tutorial.create(tutorial)
     .then(data => {
-      res.send(data);
+      return res.status(200).json(data);
     })
     .catch(err => {
-      res.status(500).send({
-        message:
-          err.message || "Some error occurred while creating the Tutorial."
-      });
+      return res.status(500).json({ message: err.message || "Some error occurred while creating the Tutorial." });
     });
 };
 
 // Retrieve all Tutorials from the database.
 exports.findAll = (req, res) => {
-  const title = req.query.title;
-  var condition = title ? { title: { [Op.like]: `%${title}%` } } : null;
+  const { title } = req.query;
+  const condition = title ? { title: { [Op.like]: `%${title}%` } } : null;
 
   Tutorial.findAll({ where: condition })
     .then(data => {
-      res.send(data);
+      return res.status(200).json(data);
     })
     .catch(err => {
-      res.status(500).send({
-        message:
-          err.message || "Some error occurred while retrieving tutorials."
-      });
+      return res.status(500).send({ message: err.message || "Some error occurred while retrieving tutorials." });
     });
 };
 
 // Find a single Tutorial with an id
 exports.findOne = (req, res) => {
-  const id = req.params.id;
+  const { id } = req.params;
 
   Tutorial.findByPk(id)
     .then(data => {
       if (data) {
-        res.send(data);
+        return res.status(200).json(data);
       } else {
-        res.status(404).send({
-          message: `Cannot find Tutorial with id=${id}.`
-        });
+        return res.status(404).json({ message: `Cannot find Tutorial with id=${id}.` });
       }
     })
     .catch(err => {
-      res.status(500).send({
-        message: "Error retrieving Tutorial with id=" + id
-      });
+      return res.status(500).json({ message: `Error retrieving Tutorial with id=${id}` });
     });
 };
 
 // Update a Tutorial by the id in the request
 exports.update = (req, res) => {
-  const id = req.params.id;
+  const { id } = req.params;
 
   Tutorial.update(req.body, {
-    where: { id: id }
+    where: { id }
   })
     .then(num => {
-      if (num == 1) {
-        res.send({
-          message: "Tutorial was updated successfully."
-        });
+      if (num === 1) {
+        return res.status(200).json({ message: "Tutorial was updated successfully." });
       } else {
-        res.send({
-          message: `Cannot update Tutorial with id=${id}. Maybe Tutorial was not found or req.body is empty!`
-        });
+        return res.status(400).json({ message: `Cannot update Tutorial with id=${id}. Maybe Tutorial was not found or req.body is empty!` });
       }
     })
     .catch(err => {
-      res.status(500).send({
-        message: "Error updating Tutorial with id=" + id
-      });
+      return res.status(500).json({ message: `Error updating Tutorial with id= ${id}` });
     });
 };
 
 // Delete a Tutorial with the specified id in the request
 exports.delete = (req, res) => {
-  const id = req.params.id;
+  const { id } = req.params;
 
   Tutorial.destroy({
-    where: { id: id }
+    where: { id }
   })
     .then(num => {
-      if (num == 1) {
-        res.send({
-          message: "Tutorial was deleted successfully!"
-        });
+      if (num === 1) {
+        return res.status(200).json({ message: "Tutorial was deleted successfully!" });
       } else {
-        res.send({
-          message: `Cannot delete Tutorial with id=${id}. Maybe Tutorial was not found!`
-        });
+        return res.status(404).json({ message: `Cannot delete Tutorial with id=${id}. Maybe Tutorial was not found!` });
       }
     })
     .catch(err => {
-      res.status(500).send({
-        message: "Could not delete Tutorial with id=" + id
-      });
+      return res.status(500).json({ message: `Could not delete Tutorial with id=${id}` });
     });
 };
 
@@ -127,13 +103,10 @@ exports.deleteAll = (req, res) => {
     truncate: false
   })
     .then(nums => {
-      res.send({ message: `${nums} Tutorials were deleted successfully!` });
+      return res.status(200).json({ message: `${nums} Tutorials were deleted successfully!` });
     })
     .catch(err => {
-      res.status(500).send({
-        message:
-          err.message || "Some error occurred while removing all tutorials."
-      });
+      return res.status(500).json({ message: err.message || "Some error occurred while removing all tutorials." });
     });
 };
 
@@ -141,12 +114,9 @@ exports.deleteAll = (req, res) => {
 exports.findAllPublished = (req, res) => {
   Tutorial.findAll({ where: { published: true } })
     .then(data => {
-      res.send(data);
+      return res.status(200).json(data);
     })
     .catch(err => {
-      res.status(500).send({
-        message:
-          err.message || "Some error occurred while retrieving tutorials."
-      });
+      return res.status(500).json({ message: err.message || "Some error occurred while retrieving tutorials." });
     });
 };