Refactor variables
Merge pull request #34 from theponti/development

Refactor variables