--- a/libqterminal/QTerminal.cpp
+++ b/libqterminal/QTerminal.cpp
@@ -19,113 +19,54 @@
 
 #include "QTerminal.h"
 
-#include "Session.h"
-#include "TerminalDisplay.h"
-
 using namespace Konsole;
 
-void *createTermWidget(int startnow, void *parent)
-{ 
-    return (void*) new QTerminal(startnow, (QWidget*)parent); 
-}
-
-struct TermWidgetImpl
-{
-    TermWidgetImpl(QWidget* parent = 0);
-
-    TerminalDisplay *m_terminalDisplay;
-    Session *m_session;
-    
-    Session* createSession();
-    TerminalDisplay* createTerminalDisplay(Session *session, QWidget* parent);
-};
-
-TermWidgetImpl::TermWidgetImpl(QWidget* parent)
-{
-    this->m_session = createSession();
-    this->m_terminalDisplay = createTerminalDisplay(this->m_session, parent);
-}
-
-
-Session *TermWidgetImpl::createSession()
-{
-    Session *session = new Session();
-
-    session->setTitle(Session::NameRole, "QTermWidget");
-    session->setProgram("/bin/bash");
-    QStringList args("");
-    session->setArguments(args);
-    session->setAutoClose(true);
-		    
-    session->setCodec(QTextCodec::codecForName("UTF-8"));
-			
-    session->setFlowControlEnabled(true);
-    session->setHistoryType(HistoryTypeBuffer(1000));
+QTerminal::QTerminal(QWidget *parent)
+    : QWidget(parent) {
+    init();
     
-    session->setDarkBackground(true);
-	    
-    session->setKeyBindings("");	    
-    return session;
-}
-
-TerminalDisplay *TermWidgetImpl::createTerminalDisplay(Session *session, QWidget* parent)
-{
-//    TerminalDisplay* display = new TerminalDisplay(this);
-    TerminalDisplay* display = new TerminalDisplay(parent);
-    
-    display->setBellMode(TerminalDisplay::NotifyBell);
-    display->setTerminalSizeHint(true);
-    display->setTripleClickMode(TerminalDisplay::SelectWholeLine);
-    display->setTerminalSizeStartup(true);
-
-    display->setRandomSeed(session->sessionId() * 31);
+    setFocus(Qt::OtherFocusReason);
+    m_terminalDisplay->resize(this->size());
     
-    return display;
-}
-
-
-QTerminal::QTerminal(int startnow, QWidget *parent)
-:QWidget(parent)
-{
-    m_impl = new TermWidgetImpl(this);
-    
-    init();
-
-    if (startnow && m_impl->m_session) {
-	m_impl->m_session->run();
-    }
-    
-    this->setFocus( Qt::OtherFocusReason );
-    m_impl->m_terminalDisplay->resize(this->size());
-    
-    this->setFocusProxy(m_impl->m_terminalDisplay);
-}
-
-void QTerminal::startShellProgram()
-{
-    if ( m_impl->m_session->isRunning() )
-	return;
-	
-    m_impl->m_session->run();
+    this->setFocusProxy(m_terminalDisplay);
 }
 
 void QTerminal::init()
-{    
-    m_impl->m_terminalDisplay->setSize(80, 40);
+{
+    m_session = new Session();
+
+    m_session->setTitle(Session::NameRole, "QTermWidget");
+    m_session->setProgram("/bin/bash");
+    QStringList args("");
+    m_session->setArguments(args);
+    m_session->setAutoClose(true);
+    m_session->setCodec(QTextCodec::codecForName("UTF-8"));
+    m_session->setFlowControlEnabled(true);
+    m_session->setHistoryType(HistoryTypeBuffer(1000));
+    m_session->setDarkBackground(true);
+    m_session->setKeyBindings("");
+
+    m_terminalDisplay = new TerminalDisplay(this);
+    m_terminalDisplay->setBellMode(TerminalDisplay::NotifyBell);
+    m_terminalDisplay->setTerminalSizeHint(true);
+    m_terminalDisplay->setTripleClickMode(TerminalDisplay::SelectWholeLine);
+    m_terminalDisplay->setTerminalSizeStartup(true);
+    m_terminalDisplay->setRandomSeed(m_session->sessionId() * 31);
+    m_terminalDisplay->setSize(80, 40);
     
     QFont font = QApplication::font(); 
     font.setFamily("Monospace");
     font.setPointSize(10);
     font.setStyleHint(QFont::TypeWriter);
-    setTerminalFont(font);
-    setScrollBarPosition(NoScrollBar);    
-        
-    m_impl->m_session->addView(m_impl->m_terminalDisplay);
-    
-    connect(m_impl->m_session, SIGNAL(finished()), this, SLOT(sessionFinished()));
+    setTerminalFont(font);  
+
+    m_session->run();
+    m_session->addView(m_terminalDisplay);
+    m_terminalDisplay->setScrollBarPosition(TerminalDisplay::ScrollBarRight);
+
+    connect(m_session, SIGNAL(finished()), this, SLOT(sessionFinished()));
 }
 
-
 QTerminal::~QTerminal()
 {
     emit destroyed();
@@ -134,136 +75,103 @@
 
 void QTerminal::setTerminalFont(QFont &font)
 {
-    if (!m_impl->m_terminalDisplay)
+    if(!m_terminalDisplay)
 	return;
-    m_impl->m_terminalDisplay->setVTFont(font);
+    m_terminalDisplay->setVTFont(font);
 }
 
 void QTerminal::setShellProgram(const QString &progname)
 {
-    if (!m_impl->m_session)
+    if(!m_session)
 	return;
-    m_impl->m_session->setProgram(progname);	
+    m_session->setProgram(progname);
 }
 
 void QTerminal::setWorkingDirectory(const QString& dir)
 {
-    if (!m_impl->m_session)
+    if(!m_session)
         return;
-    m_impl->m_session->setInitialWorkingDirectory(dir);
+    m_session->setInitialWorkingDirectory(dir);
 }
 
 void QTerminal::setArgs(QStringList &args)
 {
-    if (!m_impl->m_session)
+    if (!m_session)
 	return;
-    m_impl->m_session->setArguments(args);	
+    m_session->setArguments(args);
 }
 
 void QTerminal::setTextCodec(QTextCodec *codec)
 {
-    if (!m_impl->m_session)
+    if(!m_session)
 	return;
-    m_impl->m_session->setCodec(codec);	
-}
-
-void QTerminal::setColorScheme(int scheme)
-{
-    switch(scheme) {
-	case COLOR_SCHEME_WHITE_ON_BLACK:
-		m_impl->m_terminalDisplay->setColorTable(whiteonblack_color_table);
-		break;		
-	case COLOR_SCHEME_GREEN_ON_BLACK:
-		m_impl->m_terminalDisplay->setColorTable(greenonblack_color_table);
-		break;
-	case COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW:
-		m_impl->m_terminalDisplay->setColorTable(blackonlightyellow_color_table);
-		break;
-	default: //do nothing
-	    break;
-    };
+    m_session->setCodec(codec);
 }
 
 void QTerminal::setSize(int h, int v)
 {
-    if (!m_impl->m_terminalDisplay)
+    if(!m_terminalDisplay)
 	return;
-    m_impl->m_terminalDisplay->setSize(h, v);
+    m_terminalDisplay->setSize(h, v);
 }
 
 void QTerminal::setHistorySize(int lines)
 {
-    if (lines < 0)
-        m_impl->m_session->setHistoryType(HistoryTypeFile());
+    if(lines < 0)
+        m_session->setHistoryType(HistoryTypeFile());
     else
-	m_impl->m_session->setHistoryType(HistoryTypeBuffer(lines));
-}
-
-void QTerminal::setScrollBarPosition(ScrollBarPosition pos)
-{
-    if (!m_impl->m_terminalDisplay)
-	return;
-    m_impl->m_terminalDisplay->setScrollBarPosition((TerminalDisplay::ScrollBarPosition)pos);
-}
-
-void QTerminal::sendText(QString &text)
-{
-    m_impl->m_session->sendText(text); 
+        m_session->setHistoryType(HistoryTypeBuffer(lines));
 }
 
 void QTerminal::setReadOnly(bool readonly)
 {
-    m_impl->m_terminalDisplay->setReadOnly(readonly);
+    m_terminalDisplay->setReadOnly(readonly);
 }
 
 void QTerminal::resizeEvent(QResizeEvent*)
 {
-//qDebug("global window resizing...with %d %d", this->size().width(), this->size().height());
-    m_impl->m_terminalDisplay->resize(this->size());
+    m_terminalDisplay->resize(this->size());
 }
 
-
 void QTerminal::sessionFinished()
 {
     emit finished();
 }
 
-
 void QTerminal::copyClipboard()
 {
-    m_impl->m_terminalDisplay->copyClipboard();
+    m_terminalDisplay->copyClipboard();
 }
 
 void QTerminal::pasteClipboard()
 {
-    m_impl->m_terminalDisplay->pasteClipboard();
+    m_terminalDisplay->pasteClipboard();
 }
 
 void QTerminal::setFlowControlEnabled(bool enabled)
 {
-    m_impl->m_session->setFlowControlEnabled(enabled);
+    m_session->setFlowControlEnabled(enabled);
 }
 
 bool QTerminal::flowControlEnabled(void)
 {
-    return m_impl->m_session->flowControlEnabled();
+    return m_session->flowControlEnabled();
 }
 
 void QTerminal::setFlowControlWarningEnabled(bool enabled)
 {
     if(flowControlEnabled()) {
-	// Do not show warning label if flow control is disabled
-	m_impl->m_terminalDisplay->setFlowControlWarningEnabled(enabled);
+        m_terminalDisplay->setFlowControlWarningEnabled(enabled);
     }
 }
 
 void QTerminal::setEnvironment(const QStringList& environment)
 {
-    m_impl->m_session->setEnvironment(environment);
+    m_session->setEnvironment(environment);
 }
 
 void* QTerminal::getTerminalDisplay()
 {
-    return static_cast<void*>(m_impl->m_terminalDisplay);
+    return static_cast<void*>(m_terminalDisplay);
 }