Minor changes for cleaner code
Merge pull request #54 from monsta/patch-9

Minor changes for cleaner code