cleaning up of messy unecessary code and made another feature test
continuing to refactor
this is for commercial use
Merge pull request #60 from fiery-skippers-2014/refactoring

Refactoring