Move @todo to correct place