Remove extras lines... and add little comments