Get rid off single-char variable names