Refactor drive to make sense