tons of style changes
Merge pull request #61 from vingiarrusso/feature

tons of style changes