Minor code cleanup; updated TODO list