Merge pull request #121 from ysb33r/development

Addressing #120 (Suggestions for refactoring)