removed TODO and other formatting