checkpatch cleanup