Formatting and clean up.