Removed Player class, added some comments