Refactor complete todos