Add matra_count property
Remove 'scan' keyword in Line constructor

As of now, it's unnecessary and distracting.