Clean up the code a little, mostly formating issues, and added a todo item.
More small code cleanups.