Driver: Avoid a duplicate path separator and clean up code