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

Some cosmetic changes