Adds a TODO about cleaning up the code a bit.