Updating todo and cleaning up code style.