Additional code cleanup and addition of TODO.txt