Stylistic changes
Merge pull request #1 from timanglade/master

Minor stylistic changes