* New comments + cleaning code