(Lakka) Code refactoring and performance improvements
Merge pull request #728 from lakkatv/lakka

(Lakka) Code refactoring and performance improvements