clean up inline with coding standards
Merge branch 'origin/Create_scan_service' into Create_scan_service