cleaning up ch 2 todos