Removed TODO

Removed TODO
Fixed tabbing

Tabs to spaces