Fixing DannyUfonek's class a bit + comments