Cleaned up formatting (1/2) and updated dependencies

I'll see if I can clean up some of the 80 lines sometime but really think it's too much work. This wasn't tho.