Formatting changes
Added todo