Mostly formatting fixes