Refactor some code
Merge pull request #26 from StickmanVentures/refactor

Refactor some code