var changes, code simplification
Merge pull request #2 from KevinFXue/Kevin-changes

var changes, code simplification