Scanner redo

Dosctring!