Player Code Cleanup