Refactored for code cleanliness
Merge pull request #102 from ogwiz2/develop

(fix) Refactored for code cleanliness