Update scan and spacings
Tidy code
Add ignore