Finish change of variables and identation