fixed a lot of things checkpatch complained about