Pull request for autoformatting

Haven't done any mass formatting in a while.