Modified the styles.
Merge pull request #22 from fox-squirrels-2013/style_refactor

Style refactor