minor coding style cleanups to keep checkpatch happy