Formatting and improvement