refactored a lot. cleaned up the code a lot.
Merge pull request #1 from ColdSauce/master

refactored a lot. cleaned up the code a lot.