Wrap long line
Improve variable names