Improve the variable names, principal elements.