short variable names
code cleanup