removed short variable names