Scan completely implemented. Clean code next