Many changes to the code.
Merge pull request #26 from Gistbook/organize-styl

Many changes to the code.