Formatting, getting rid of todos that we don't need