cosmetic changes (variable names duplicity removed)