Mostly formatting and a little todo.