Formatting and clean-up