Merge pull request #101 from ogwiz2/develop

(fix) Refactored comments, names, and spacing
Refactored for code cleanliness