Formatting changes, added TODO