Refactored makedrive