FIX: removed the accidental DEBUG statements & cleaned a bit