Improved code readabilty and fixed minor issues
Merge pull request #1 from Rnhmjoj/master

Improved code readabilty and fixed minor issues