Todo

Added some cleanup and consistency items to the TODO list