Formatting and fixing