Fixed code indentation.
Updated TODO list.