Formatting clean-up