Doing some cleanup.
Small code improvement.
Starting the TODO list.