moved variables up in source order
Merge branch 'simplify' of github.com:uikit/uikit into simplify