Attempt at introducing basic player cleanup.
Responded to Steve's review comments.
Fix minor bug.
More review comments.
Merge pull request #416 from shans/playerCleanup

Attempt at introducing basic player cleanup.