Cleanup global vars
Merge branch 'master' of https://github.com/Cakebox/Cakebox-light