diff --git a/packages/form-XChange/contracts/FeedbackForm.sol b/packages/form-XChange/contracts/FeedbackForm.sol
index 86d0581..0585ddb 100644
--- a/packages/form-XChange/contracts/FeedbackForm.sol
+++ b/packages/form-XChange/contracts/FeedbackForm.sol
@@ -17,23 +17,32 @@ contract FeedbackForm {
     mapping(uint => Question) public questions;
     mapping(address => bool) public feedbackProviders;
 
-    constructor(string memory _title, string memory _description) {
-        owner = tx.origin;
+    constructor(
+        address _owner,
+        string memory _title,
+        string memory _description
+    ) {
+        owner = _owner;
         title = _title;
         description = _description;
     }
 
     modifier onlyOwner() {
-        require(tx.origin == owner, "Only owner can call this function.");
+        require(msg.sender == owner, "Only owner can call this function.");
         _;
     }
 
     modifier hasProvidedFeedback() {
-        require(!feedbackProviders[tx.origin], "User has already prvoded feedback.");
+        require(
+            !feedbackProviders[msg.sender],
+            "User has already prvoded feedback."
+        );
         _;
     }
 
-    function getHasProvidedFeedback(address _address) public view returns (bool) {
+    function getHasProvidedFeedback(
+        address _address
+    ) public view returns (bool) {
         return feedbackProviders[_address];
     }
 
@@ -52,11 +61,7 @@ contract FeedbackForm {
         return (questions[_id].value, questions[_id].feedback);
     }
 
-    function getAllQuestions()
-        public
-        view
-        returns (Question[] memory)
-    {
+    function getAllQuestions() public view returns (Question[] memory) {
         Question[] memory allQuestions = new Question[](numberOfQuestions);
         for (uint i; i < numberOfQuestions; i++) {
             allQuestions[i] = questions[i];
diff --git a/packages/form-XChange/contracts/FeedbackFormFactory.sol b/packages/form-XChange/contracts/FeedbackFormFactory.sol
index 4ce56cd..652bda6 100644
--- a/packages/form-XChange/contracts/FeedbackFormFactory.sol
+++ b/packages/form-XChange/contracts/FeedbackFormFactory.sol
@@ -11,7 +11,11 @@ contract FeedbackFormFactory {
         string memory _title,
         string memory _description
     ) public returns (FeedbackForm) {
-        FeedbackForm feedbackForm = new FeedbackForm(_title, _description);
+        FeedbackForm feedbackForm = new FeedbackForm(
+            msg.sender,
+            _title,
+            _description
+        );
         feedbackForm.setQuestions(_questions);
         feedbackForms.push(feedbackForm);
         return feedbackForm;
@@ -24,14 +28,4 @@ contract FeedbackFormFactory {
     function getFeedbackFormById(uint _id) public view returns (FeedbackForm) {
         return feedbackForms[_id];
     }
-
-    function getAllQuestions(
-        uint _id
-    ) public view returns (FeedbackForm.Question[] memory) {
-        return feedbackForms[_id].getAllQuestions();
-    }
-
-    function submitFeedback(uint _id, uint[] memory _feedback) public {
-        feedbackForms[_id].submitFeedback(_feedback);
-    }
 }