Formatting, and added todo.