Cleaning up a bit.
Making task list.