Cleaned up code
Merge branch 'master' of https://github.com/panjiw/Team-Player