continue cleaning code from todos