Cleaned up Player class