Formatting and updated todo