Various fixes, mostly style.
Merge pull request #2 from maurodec/style-fixes

Various fixes, mostly style.