Naming of variables improved.