Merge pull request #58 from fiery-skippers-2014/refactoring

Refactoring

checked. looks good!
cleaning up of messy unecessary code and made another feature test