Slight cleanups to the kernel driver