Cleaning up a scan tutorial