Change Files Scan command to use OC\User\Manager
Cleanup and more style fixes