Fixed some msftidy issues and removed datastore['SYSDRIVE']