Some rearangement of code, minor change
Merge pull request #6 from Enlightment/master

Some rearangement of code, minor change