variable name improvements in solution