Additional formatting clean-ups