(XMB) Code refactoring
Merge pull request #1242 from lakkatv/xmb

(XMB) Code refactoring