Tidying up XBMC functionality