Formatting changes, added TODO note