* Rework the code scanner
