variable refactoring
Merge pull request #68 from Ricky1833/master

variable refactoring