Formatting and clean up