Updated Code. Cleaned static refrences. overall update.
Merge pull request #1 from ProjectBarks/master

Cleaned and Updated Code