Fix many minor formatting issues