Scanner working! Tidy up1