Add drives reset and some code clean up

Change for being reset in some circumstances plus clean up