Solely formatting fixes