Some cosmetic changes
Merge pull request #590 from ymn/master

Some cosmetic changes