Fixed lines and remove comments