Fix formatting issues across the board