Little clean up
TODO and tabulator