cleaned up Player class