more merges
mainly some cleanup and organization of code with more linux friendly descriptive naming, when possible (also formatted as described in the kernel docs).