Cleaned up some player code
Cleaned up some player code