WIP: improving style
Merge pull request #2 from smspezzano/style

WIP: improving style