todo changes, cleanup