Cleaned up, modularized and added tooltip.
Merge pull request #15 from darkowlzz/cleanup

Cleaned up, modularized and added tooltip.