Cleaned up XBMC add on