diff --git a/Skin.cpp b/Skin.cpp
index 6daf3d5..4c2d24e 100644
--- a/Skin.cpp
+++ b/Skin.cpp
@@ -132,8 +132,6 @@ Skin::getPixmap (QString f, QDir dir)
 QPixmap *
 Skin::getPixmap (string file)
 {
-	/* check for files in zip and check if file exists */
-
 	QDir dir;
 	QString f = QString::fromStdString (file);
 
@@ -149,8 +147,6 @@ Skin::getPixmap (string file)
 	}
 
 	return NULL;
-
-	/*return new QPixmap ((m_path+file).c_str());*/
 }
 
 
diff --git a/SkinChooser.cpp b/SkinChooser.cpp
index 91bf4ae..b5b1fdb 100644
--- a/SkinChooser.cpp
+++ b/SkinChooser.cpp
@@ -15,21 +15,29 @@ SkinChooser::SkinChooser (QWidget *parent) : QMainWindow (parent)
 #endif
 	
 	m_mw = dynamic_cast<MainWindow *>(parent);
-	QWidget *c = new QWidget (this);
-	setCentralWidget (c);
+	m_c = new QWidget (this);
+	setCentralWidget (m_c);
 
-	m_vbox = new QVBoxLayout (c);
-	QLabel *label = new QLabel ("Available skins...", c);
-	label->setFont (QFont ("Helvetica", 16));
-	m_vbox->addWidget (label);
+	m_vbox = new QVBoxLayout (m_c);
+	m_label = new QLabel ("Available skins...", m_c);
+	m_label->setFont (QFont ("Helvetica", 16));
+	m_vbox->addWidget (m_label);
 
-	m_skin = new SkinList (c);
+	m_skin = new SkinList (m_c);
 	m_vbox->addWidget (m_skin);
 
 	resize (500, 300);
 
 }
 
+SkinChooser::~SkinChooser (void)
+{
+	delete m_c;
+	delete m_vbox;
+	delete m_label;
+	delete m_skin;
+}
+
 SkinList::SkinList (QWidget *parent) : QListWidget (parent)
 {
 
@@ -63,7 +71,6 @@ SkinList::changeSkin (QListWidgetItem *item)
 
 	QSettings settings;
 
-	SkinChooser *sc = dynamic_cast<SkinChooser *>(window());
 	qDebug ("change skin to %s", qPrintable (item->text()));
 
 	skin->setSkin (QDir::homePath()+"/.xmms2/clients/promoe/skins/"+item->text());
diff --git a/SkinChooser.h b/SkinChooser.h
index 629d3d1..c0fda88 100644
--- a/SkinChooser.h
+++ b/SkinChooser.h
@@ -20,13 +20,14 @@ class SkinChooser : public QMainWindow
 {
 	public:
 		SkinChooser (QWidget *parent);
-		~SkinChooser () {}
+		~SkinChooser (void);
 		MainWindow *getMW (void) { return m_mw; }
 
 	private:
 		QVBoxLayout *m_vbox;
 		SkinList *m_skin;
 		QLabel *m_label;
+		QWidget *m_c;
 		MainWindow *m_mw;
 
 };