moving TODO and formating