Refactor
Remove todo