ZXShady

Results 11 issues of ZXShady

these should make the code simpler to read and be faster to compile. I also removed a duped line in clang-format