Changes according Glazkov's review notes (mainly variable renaming)