Cleaning up functions
Merge pull request #49 from kaiprt/master

Cleaning up functions and adding chromeless player.
Cleaning merges