Remove todo
Show (empty)
Some improvement