Formatting and error fix