Make todo as done.
Litle DB code refactoring