code clean up - new helpers created & TODO section needs to be fixed soon
Merge pull request #9 from sirriperek/master

code clean up - new helpers created & TODO section needs to be fixed soo...