Cleaned up player code slightly.