TODO items and fix an indentation.