Finished cleaning of mScan method

Much better now...