diff --git a/juci/source.cc b/juci/source.cc
index 8070f7e..48c5a19 100644
--- a/juci/source.cc
+++ b/juci/source.cc
@@ -1,47 +1,44 @@
 #include "source.h"
 #include <iostream>
 
-using namespace std;
-
-
 //////////////
 //// View ////
 //////////////
 Source::View::View() {
-  cout << "View construktor run" << endl;
+  std::cout << "View constructor run" << std::endl;
 }
 
 void Source::View::UpdateLine(Glib::RefPtr<Gtk::TextBuffer::Mark> mark) {
-  cout << "Update line called. linum: " << mark->get_iter().get_line() << endl;
+  std::cout << "Update line called. linum: ";
+  std::cout << mark->get_iter().get_line() << std::endl;
 }
 
 ///////////////
 //// Model ////
 ///////////////
-Source::Model::Model(){
-  cout << "Model construktor run" << endl;
+Source::Model::Model() {
+  std::cout << "Model constructor run" << std::endl;
 }
 
 ////////////////////
 //// Controller ////
 ////////////////////
 
-/**
- *
- */
+// Source::Controller::Controller()
+// Constructor for Controller
 Source::Controller::Controller() {
-  cout << "Controller construktor run" << endl;
+  std::cout << "Controller constructor run" << std::endl;
 }
-/**
- *
- */
-std::shared_ptr<Source::View> Source::Controller::sourceview() {
-  sourceview();
-  return std::shared_ptr<Source::View>(&sourceview_);
+// Source::Controller::view()
+// return shared_ptr to the view
+std::shared_ptr<Source::View> Source::Controller::view() {
+  return std::shared_ptr<Source::View>(&view_);
 }
-/**
- *
- */
-void Source::Controller::OnLineEdit(Glib::RefPtr<Gtk::TextBuffer::Mark> mark){
-
+// Source::Controller::model()
+// return shared_ptr to the model()
+std::shared_ptr<Source::Model> Source::Controller::model() {
+  return std::shared_ptr<Source::Model>(&model_);
 }
+// Source::Controller::OnLineEdit()
+// fired when a line in the buffer is edited
+void Source::Controller::OnLineEdit(Glib::RefPtr<Gtk::TextBuffer::Mark> mark) {}
diff --git a/juci/source.h b/juci/source.h
index 773b15e..8d5d9a6 100644
--- a/juci/source.h
+++ b/juci/source.h
@@ -21,11 +21,15 @@ namespace Source {
   class Controller {
   public:
     Controller();
-    std::shared_ptr<Source::View> sourceview();
+    std::shared_ptr<View> view();
+    std::shared_ptr<Model> model();
+
   private:
     void OnLineEdit(Glib::RefPtr<Gtk::TextBuffer::Mark> mark);
+
   protected:
-    View sourceview_;
+    View view_;
+    Model model_;
   };  // class Controller
 }  // namespace Source
 #endif  // JUCI_SOURCE_H_