cleaned up UpdateScan
Merge pull request #71 from timbokopter/feature/cleanup_UpdateScan

cleaned up UpdateScan