Code style
Removed fixed TODO