updated todo
writer code cleanup
updated todo