Minor code cleanup
Merge pull request #59 from Farsx/master

Minor code cleanup