Cleaning up more style.
Merge pull request #210 from nstielau/more_style

Cleaning up more style.